Merge version 2.31-13+rpi1+deb11u13 and 2.31-13+deb11u14 to produce 2.31-13+rpi1...

diff --cc debian/changelog
index bdac59b9fd7c6082ff6dc3bb5abc01be11e4c918,92465c10369cf7c82ac92786e909c1752fd7b752..a8ac1c5f42afced966a2e3ebedb5ce5c186fb859
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,20 +1,37 @@@
- glibc (2.31-13+rpi1+deb11u13) bullseye-staging; urgency=medium
++glibc (2.31-13+rpi1+deb11u14) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 2.29-9+rpi1 by Peter Michale Green]
 +  * Change mode on scripts/check-obsolete-constructs.py to 644, 
 +    dgit does not like mode 755 files created by patches and the
 +    script does not seem to be used for anything in the Debian
 +    package.
 +
 +  [changes introduced in 2.31-13+rpi1+deb11u3 by Peter Michael Green]
 +  * Change mode on sysdeps/x86_64/configure to 644, same dgit issue
 +    as above.
 + 
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 30 May 2025 00:15:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jun 2026 16:12:55 +0000
++
+ glibc (2.31-13+deb11u14) bullseye-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS Team.
+   * debian/patches/git-updates.diff: update from upstream stable branch
+     (4 commits total, including 2 CVE fixes):
+     - aarch64: MTE compatible strncmp
+     - nptl: Optimize trylock for high cache contention workloads
+     - memalign: reinstate alignment overflow check (CVE-2026-0861)
+     - posix: Reset wordexp_t fields with WRDE_REUSE (CVE-2025-15281)
+   * Backport patches to fix 3 CVEs:
+     - CVE-2025-8058: posix: Fix double-free after allocation failure in
+       regcomp
+     - CVE-2026-0915: resolv: Fix NSS DNS backend for getnetbyaddr
+     - CVE-2026-4046: iconvdata: Use pending character state in IBM1390,
+       IBM1399 character sets
+ 
+  -- Arnaud Rebillout <arnaudr@debian.org>  Wed, 27 May 2026 11:49:44 +0700
  
  glibc (2.31-13+deb11u13) bullseye-security; urgency=high
  

diff --cc debian/patches/git-updates.diff
Simple merge